Fixes due to legal files