CHANGE: fixed some code to build properly