fixes after lb testing