[#74] Small Fixes