Solving some issues