Fixed couple minor bugs introduced by depending on version signature