Fixes from develop