Misc fixes for modal animation & co.