Misc bugfixes
Core repos update