Add more kibit-inspired fixes