Made some things work