Some fixes here and there