More fixes/workarounds/enhancements for 11G and walkthrough 1