Small fixes
Updated to dev