comptime fixes