Fixed small bugs and placed Override flags