Fix up last few compiler errors