Fixed minor compile-time-issues in helper classes