Clean up of compile time warnings