Dev

Couple of fixes