More fixes which definitely are not my fault