Fixed encoder nullification;
Fixed build errors;