Some fixes for SS + Angular and new SS + Bootstrap