fixes/dirty hacks