Fixes to merge from develop