And moar bugs from JOEY fixed