Default config and little fixes