Fix compiler errors after the gestalt-module merge