Additional compile-without-graphics fixes