Some hacky fixes.