Fix my issues