Added missing files
Small fixes