Paint fix and more