LITTLE BUG FIXES!!!