more lazy fixes