Getting rid of some warnings

Final map not complete.
Getting rid of warnings