Minor compiler error fix attempts