Fix typo and remote hardcode