[#7] Fixes