Improved general config
CS fixes