Fixing some problems on merge #43