some random fixes here and there