BlockUI minor fixes and cleanup