Overall fixes!