Attempt at fixes....