various fixes for 1.6.1, mainly in admin