Fixing the stupid little probs