Minor fixes - rebuild of project

This are some minor changes due to a project rebuild