Cleaning up some lint issues
Warnings and deprecations are now located, further WIP, something broken