minor hacks