cosmetic fixes/workarounds