fixes for compatibility with Apportable (temporary!)