Admin additions fixes & Flap fixes.