Some cleanup, workarounds, etc