Minor hack fixes