Small fixes that were neccessary to use some classes