fixed a screwed up bug fix
Some new compiler warnings