Bugfixes and admin ajax