Fix scalar compound type issue
Address issues from #347
Merge pull request #353 from andrewcollette/issue_347

Address issues from #347
Merge pull request #352 from andrewcollette/scalar_compound_issue250

Fix scalar compound type issue