Repaired small bugs