Implement another fixes.