Fixes to workaround errors