Some more work on fbo