Fixing technical issues (2)