Correct package bin.
Add misc fixes.