Fixes after some testing