Some compiler error fixing