Some fixes here