Some issues fixed.