Fixed some problems with my local branch