Fixed 'em bugs