Some minor hacks