Includes fixes suggested by Aby