Fixed minor issues, caused by previous commits