Misc bug fixed