Added more niceness for 4.4