Trying out more fixes...