Some more fixed stuff

Some more fixed stuff