More bug fixeds