Fixes, changes and whatnot