Various routing fixes, re-enables function based routes