Cleanup code warnings etc