Remove some warnings and bug fixes