Fixed some errors due to UI...