Made some more things work :-)