Small fixes to develop branch