Fixed some high priority bugs from launchpad