Final fixes after merge with gecube/master