Some warnings + fixes #10