Fix bugs
Update build