more ugly things due to 5.3 compatibility (5.4 rulez)