Develop

Minor fixes