Fixing certain issues