Marked some bugs to fix...