Develop branch - two minor warning fixes