Correct VLA warnings. Fixes #18 and #19