Fixes for implementation of ExtJS 5