Lab plan fixes