Fixed config and other things