Fixing some.. issues