Some fixes, starting use branches