Out format fixes, package name fixes