Finished conversion and fixing build