Hopefully, final fixes