Minor fixes and add glob patterns