[#50] Eliminate compilation issues