Solving some issues

#1