Fix some stupid bugs......