Fix some compiler errors