get rid of some warnings and make it easier to release