Minor changes to compdef stuffs and remove bundler check