Change to proper package name
Fix warnings