Fix warnings, fixes #5