small changes to remove warnings and get it to compile