Fix error
Update build system