these are fixes