Trying to do some bugfixes