Fixes as a result of testing