Scrub bar & warnings fixes 

Please review fork.