Some small hacks...