Temporary repo for fixes to cl-basefiles package