Add Skytap and fix an encoding bug