Updating default configuration and fixing missing target