small and final quick fixes