Final minute bug fixes <Karthik>