Minor hacks