Fixes to FBO mode feature