Fixing initial issues