Fixes and improvments to the basic branches