Josh fixes