Trying to bugfix some more