Apply default options properly