Some fixes for static output