Pulled and updated from Joel's fixes