FIX: Minor fixes to branch, rebase