MISC - Helper bugfixes