Fixed some warnings - ready for testing;