Minor updates to parsing logic