AWESOME bugfixes