Cleaning development

Small fixes on commits from development