Warnings cleaning up