Tmp fixes here.. Needs to be touched.