Fix little bugs, stable build