Fixed more things to make development nice