Some strange fixes.