Fixes initial bugs