Added some defaults required for packaging