Removing warnings, some #111 and #155