more fixes to toScreen macros