Fixes due to lack of testing