Some fixes here & there.