Fixed initial issues