nasty fixes to support views