[#18] Solution for some compilation issues