Some more tweaks and fixed geo fencing crashing