Finish cleanup, fix permissions