Fix some warnings
Finish lab04