Implied changes and fixes by Stratelit