Bugfixes, resizing changes