Minor bug fixes involving data parsing to the model