Further no-graphics fixes