Solving some issues...