more boostrap file fixes