Various fixes and cleanup of customize stuff