Small Error fixes