JP's fixes