Fixes in combined js admin