Some strange fixes