Fix couple of warnings. Make forward declarations to match to real declarations.