Issue #6 - Reduce compile errors in prep for test