Important BUG FIXES