More hacky fixes