Fix poolboy-related bugs