Minor workarounds