Updated to compile with base 4.6