Minor fixes plus admin