Hardcoded package fix
Options update