Fixing number of minor issues

Fixing: 
- #1157 
- #1159 
- #1177 
- #1187 
- #1191 
- #1212 
- #1213 
- #1218