Fix them issues