Attempted fixes blindly :)