Fix environment variables expansion for shortcuts