package branch fixes