Resolved build issues after separation from main project, see #1